[backport] Fix lack of type avoidance in argument lifting #15237
+42
−4
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.